Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new POST :batchDelete callbacks #2893

Merged
merged 2 commits into from
Dec 15, 2023
Merged

Use new POST :batchDelete callbacks #2893

merged 2 commits into from
Dec 15, 2023

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 7, 2023

What does this implement/fix?

Use new special POST :batchDelete callbacks for /api/groups, /api/domains, /api/clients, and /api/lists and remove some code duplication along the way.

Also ensure that the "Default" group cannot be selected for deletion (we already suppress the trash button for this entry).

Need FTL from pi-hole/FTL#1810


Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

…ains/, /api/clients, and /api/lists and remove some code duplication along the way. Also ensure that the "Default" group cannot be selected for deletion (we already suppress the trash button for this entry)

Signed-off-by: DL6ER <dl6er@dl6er.de>
@@ -561,35 +561,35 @@ function listAlert(type, items, data) {
// Show a list of successful items if there are any
if (data.processed.success.length > 0) {
message +=
"<strong>Successfully added " +
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and further HTML tags are removed as this string is later HTML-encoded ans they have been appearing in the toast as plain text. This is already broken in development-v6 right now.

@rdwebdesign
Copy link
Member

I started to test the PR and it works with Groups, Clients and Domains...

But it failed with Lists:

Uncaught TypeError: string is undefined [utils.js:535:15](http://192.168.0.207/admin/scripts/pi-hole/js/utils.js?v=0)

I can delete single items (red thrash can button).
I'm investigating.

rdwebdesign
rdwebdesign previously approved these changes Dec 11, 2023
scripts/pi-hole/js/groups-lists.js Outdated Show resolved Hide resolved
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Dominik <DL6ER@users.noreply.github.com>
@DL6ER DL6ER merged commit 371a1fd into development-v6 Dec 15, 2023
8 checks passed
@DL6ER DL6ER deleted the new/batchDelete branch December 15, 2023 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants